From 6dd5565b4e500b3f1d2f0c3ccb4ffbbc43a2856b Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= <ok@src.gnome.org>
Date: Mon, 15 Aug 2005 14:33:29 +0000
Subject: [PATCH] syncing up with normal makefiles

---
 ChangeLog          | 6 ++++++
 Makefile-mini      | 2 +-
 babl/Makefile-mini | 7 ++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6eb4920..5e41083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-15  Øyvind Kolås  <pippin@gimp.org>
+
+	* Makefile-mini: compile both the nop and introspect programs by
+	default.
+	* babl/Makefile-mini: link with standard math library
+
 2005-08-14  Øyvind Kolås  <pippin@gimp.org>
 	
 	* tests/float_to_u8.c
diff --git a/Makefile-mini b/Makefile-mini
index 72b3abf..d54c438 100644
--- a/Makefile-mini
+++ b/Makefile-mini
@@ -2,7 +2,7 @@
 # introspection/sanity tests, will not build an actual library
 
 all:
-	make -f Makefile-mini -C babl ../tests/nop
+	make -f Makefile-mini -C babl
 	tests/nop
 introspect:
 	make -f Makefile-mini -C babl ../tests/introspect
diff --git a/babl/Makefile-mini b/babl/Makefile-mini
index ea1d7fb..aad334d 100644
--- a/babl/Makefile-mini
+++ b/babl/Makefile-mini
@@ -8,7 +8,8 @@ TARGETS =				\
 
 default: $(TARGETS)
 
-CFLAGS = -Wall -Werror -g -O1 -I./babl-base  -I. -I..
+CFLAGS = -Wall -Werror -g -O0 -I./babl-base  -I. -I..
+LDADD  = -lm
 
 BABL_OBJECTS=					\
 	babl.o					\
@@ -36,10 +37,10 @@ BABL_OBJECTS=					\
 
 
 ../tests/nop: ../tests/nop.c $(BABL_OBJECTS)
-	gcc -o $@ $< $(BABL_OBJECTS) -I../babl/
+	gcc -o $@ $< $(BABL_OBJECTS) -I../babl/ $(LDADD)
 
 ../tests/introspect: ../tests/introspect.c $(BABL_OBJECTS)
-	gcc -o $@ $< $(BABL_OBJECTS) -I../babl/
+	gcc -o $@ $< $(BABL_OBJECTS) -I../babl/ $(LDADD)
 
 clean:
 	rm -f $(TARGETS) $(BABL_OBJECTS) ../*~ ../*/*~ ../*/*~
-- 
2.30.2